From fc87244286f198347da3a6cf5a4f3bc61ea9b3ef Mon Sep 17 00:00:00 2001
From: "kaf24@firebug.cl.cam.ac.uk" <kaf24@firebug.cl.cam.ac.uk>
Date: Thu, 18 May 2006 10:43:05 +0100
Subject: [PATCH] Remove __TEST_HARNESS__ tests from x86_emulate: instead check
 for __XEN__ Signed-off-by: Keir Fraser <keir@xensource.com>

---
 tools/tests/Makefile       | 2 --
 xen/arch/x86/x86_emulate.c | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/tools/tests/Makefile b/tools/tests/Makefile
index afa6578619..263caffb46 100644
--- a/tools/tests/Makefile
+++ b/tools/tests/Makefile
@@ -4,8 +4,6 @@ include $(XEN_ROOT)/tools/Rules.mk
 
 TARGET := test_x86_emulator
 
-HOSTCFLAGS += -D__TEST_HARNESS__
-
 .PHONY: all
 all: $(TARGET)
 
diff --git a/xen/arch/x86/x86_emulate.c b/xen/arch/x86/x86_emulate.c
index 7c28dd87b9..d13eb5689f 100644
--- a/xen/arch/x86/x86_emulate.c
+++ b/xen/arch/x86/x86_emulate.c
@@ -6,7 +6,7 @@
  * Copyright (c) 2005 Keir Fraser
  */
 
-#ifdef __TEST_HARNESS__
+#ifndef __XEN__
 #include <stdio.h>
 #include <stdint.h>
 #include <public/xen.h>
@@ -1127,7 +1127,7 @@ x86_emulate_memop(
     return -1;
 }
 
-#ifndef __TEST_HARNESS__
+#ifdef __XEN__
 
 #include <asm/mm.h>
 #include <asm/uaccess.h>
-- 
2.30.2